From 51b09c0ad03ca7005236a6858b65e60198aef0ab Mon Sep 17 00:00:00 2001 From: Pascal Packaging Team Date: Mon, 12 Dec 2016 20:35:43 +0000 Subject: [PATCH] arm_UMULL_support_fix Gbp-Pq: Name arm_UMULL_support_fix.patch --- fpcsrc/compiler/arm/cpuinfo.pas | 4 ++-- fpcsrc/compiler/arm/rgcpu.pas | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fpcsrc/compiler/arm/cpuinfo.pas b/fpcsrc/compiler/arm/cpuinfo.pas index 95080f24..043e5260 100644 --- a/fpcsrc/compiler/arm/cpuinfo.pas +++ b/fpcsrc/compiler/arm/cpuinfo.pas @@ -761,8 +761,8 @@ Const { cpu_armv7 } [CPUARM_HAS_BX,CPUARM_HAS_BLX,CPUARM_HAS_BLX_LABEL,CPUARM_HAS_CLZ,CPUARM_HAS_EDSP,CPUARM_HAS_REV,CPUARM_HAS_RBIT,CPUARM_HAS_LDREX,CPUARM_HAS_DMB,CPUARM_HAS_THUMB2,CPUARM_HAS_UMULL], { cpu_armv7a } [CPUARM_HAS_BX,CPUARM_HAS_BLX,CPUARM_HAS_BLX_LABEL,CPUARM_HAS_CLZ,CPUARM_HAS_EDSP,CPUARM_HAS_REV,CPUARM_HAS_RBIT,CPUARM_HAS_LDREX,CPUARM_HAS_DMB,CPUARM_HAS_THUMB2,CPUARM_HAS_UMULL], { cpu_armv7r } [CPUARM_HAS_BX,CPUARM_HAS_BLX,CPUARM_HAS_BLX_LABEL,CPUARM_HAS_CLZ,CPUARM_HAS_EDSP,CPUARM_HAS_REV,CPUARM_HAS_RBIT,CPUARM_HAS_LDREX,CPUARM_HAS_THUMB_IDIV,CPUARM_HAS_DMB,CPUARM_HAS_THUMB2,CPUARM_HAS_UMULL], - { cpu_armv7m } [CPUARM_HAS_BX,CPUARM_HAS_BLX,CPUARM_HAS_CLZ,CPUARM_HAS_EDSP,CPUARM_HAS_REV,CPUARM_HAS_RBIT,CPUARM_HAS_LDREX,CPUARM_HAS_THUMB_IDIV,CPUARM_HAS_DMB,CPUARM_HAS_THUMB2], - { cpu_armv7em } [CPUARM_HAS_BX,CPUARM_HAS_BLX,CPUARM_HAS_CLZ,CPUARM_HAS_EDSP,CPUARM_HAS_REV,CPUARM_HAS_RBIT,CPUARM_HAS_LDREX,CPUARM_HAS_THUMB_IDIV,CPUARM_HAS_DMB,CPUARM_HAS_THUMB2] + { cpu_armv7m } [CPUARM_HAS_BX,CPUARM_HAS_BLX,CPUARM_HAS_CLZ,CPUARM_HAS_EDSP,CPUARM_HAS_REV,CPUARM_HAS_RBIT,CPUARM_HAS_LDREX,CPUARM_HAS_THUMB_IDIV,CPUARM_HAS_DMB,CPUARM_HAS_THUMB2,CPUARM_HAS_UMULL], + { cpu_armv7em } [CPUARM_HAS_BX,CPUARM_HAS_BLX,CPUARM_HAS_CLZ,CPUARM_HAS_EDSP,CPUARM_HAS_REV,CPUARM_HAS_RBIT,CPUARM_HAS_LDREX,CPUARM_HAS_THUMB_IDIV,CPUARM_HAS_DMB,CPUARM_HAS_THUMB2,CPUARM_HAS_UMULL] ); { contains all CPU supporting any kind of thumb instruction set } diff --git a/fpcsrc/compiler/arm/rgcpu.pas b/fpcsrc/compiler/arm/rgcpu.pas index ca55f59f..be21c685 100644 --- a/fpcsrc/compiler/arm/rgcpu.pas +++ b/fpcsrc/compiler/arm/rgcpu.pas @@ -579,9 +579,9 @@ unit rgcpu; A_SMULL, A_SMLAL: begin + add_edge(getsupreg(taicpu(p).oper[0]^.reg),getsupreg(taicpu(p).oper[1]^.reg)); if current_settings.cputype